- added comments
- minor fixes and changes