Enabled basic syntax highlighting
Bugfixes and small modifications