Fixed __main__.py issue, and removed excess code. If you need some removed code, rollback, or ask me for it.