fixes and reformats