fixed out of bounds error and added som properties
Merge branch 'master' of https://github.com/KoffKoff/LexGen