Cleaned up a bunch of stuff, getting ready to publish on market, bug fixes