minor fixes and formating