- some minor updates
- merged changes