Added more support for highlighting and started to add the console to the editor