Tower Gen Changes and Code Cleanup

Made some changes, did some research, and I finally discovered at least
a temporary place to put the generation of the tower where it won't quit
in the middle. Also did make it at least a little easier to read some of
the code.