initial fixes and tweeks