Added 'kill' switch for counts and fixed some formatting