More logging removal (will be replaced with more generic solution)
Remove some minor warnings. Add full Javadoc.
Minor logging change