Added TODOs detailing the work that needs to be completed, fixed a few small issues