Code Merge

Merged Levy's branch to this.  Minor updates and bug fixes with towers
and ui