Changing to toggle

and also formatting output a little differently
Fixing some mismatched formatting