made fixes and tweaks