Eve, that sounds fine.
As far as the ammonia, if your water is treated with chloramines at the drinking water plant, when you use dechlorinator, it breaks the chlor (chlorine) amine (ammonia) bond, causing a bit of ammonia in the tank. This is usually easily handled in a cycled tank, and shouldn't cause problems in the future, as long as the tank is properly cycled.