Minor updates
Fix for colour in lines
TODOs