formatting fixes and stuff