bug fixes and story changes