Added Syntax highlighting, fixed some bugs.