Testing and Documentations

Some adjustments after testing and added scaladoc.