Removed some comments
Support in form parsing for underscores in token names
Some optimizations and comment/print removal