- optimized code
- fixed inconsistencies