Grammar fixes

- Fixed the number handling in the tokenizer
- JSon serializer is now custom created to allow for DefaultValue
handling
- Added tag into token to hold custom data