javadoc comments + some improvements / debug