More bug fixes and tweeks