changes by thomas thomsen

- cleanup
- new text here and there
- new default values