Spring cleaning. Added TODOs, dried out parsing code.