Tower types, firing fixes
Merge pull request #35 from jhirst/NewBranch

Tower types, firing fixes