minor fixes and such