Clean up, added notes and TODOs.