Some small optical edits. Added Tower class and package.
Merged master into bholste
Small correction on naming caused by the prior merge