Last minute bug fixes and tweeks.