Commit 18: Fixed bug that caused crash after entering address.  Cleaned up some code.