- fixed case of some identifiers
- added some helpful methods