made minor fixes and tweaks