JavaDoc completed, minor changes to logging