Dwarf Puffer

Scared the hell out of me yesterday though. The slightly bigger one attacked the little one and the little one puffed up :(

I have never seen my DPs puff!
 
I have an open 10 gallon that I want to make into a dwarf puffer tank. I know nothing about them besides that they need brakish water. Now i have a couple question.
1. Is 10 gallons big enough?
2. How do i make the water brakish and how can i fishless cycle it?
3. What other fish can I have in the tank with them. (Catfish or something to clean the tank) I was thinking bumblbee gobies but i dont no if they are much of a clean up crew.

I keep 3 in a 10 gallon. Weekly water changes are important, but 3 in a 10 Gal seems like a pretty comfortable number.
 
I never saw a DP puff but one time my red eyed puffer bit a figure 8 in the belly and he puffed, when he wiggled out the water all his food came out of his mouth. I thought he was popped. It was scary.
 
AquariaCentral.com