Fixed a ton of stuff, added more features, the usual.