- removed comments
- fixed mapping errors