- minor changes to init methods
- fixed javaDoc
- first tests OK