added syntax highliting and some fixes