Hackathon fixes

Also, whitespace :police_car: