Cleaned up error messages, cleaned up the UI a little bit
Merge branch 'master' of https://github.com/atdyer/SMT