fix formatting and zeroing