Fixes and reformatting

Still needs to support user typing names, but can come later