Fixing some tower stuff, refactors.