added notes and TODOs