Fixed ordering of tokens; made everything work.