Small improvements...

- some corrections
- changed parameters
- some re-engineering of functions