Minor text tweaks
Added TODOs