changed general formatting
changed tokenization, made it saner, preparing to merge
added comments, fixed some token translations, added atom special values