bugfix & lot of scaladoc