Added syntax tokens and fixed a few things