minor fixes and nitpick