Minor fixes and tweeks