Fixed a few bugs, added a few features, updated TODOs, blablah.