minor fixes and more fooling around