Fixed Issues

- Added "_" for IDs
- Changed comments
- Fixed keywords file
- Added fix for " " char
- Included new test file