various changes:
- style guide changed
- use of setter methods
- further changes