Cleared out silly log messages.  Discovered bugs

PR'ing this so I can get off branch 07 and move over to issue 21