Added some todo messages, fixed some facepalm-worthy bugs, some other stuff.