storyline fixes and cleanup
Merge branch 'master' of https://github.com/ossie7/BMT