Syntax highlighting correction
Added low priority TODOs