Update Issue 55

Fix Javadoc
Update Issue 55

Adding more logging at TRACE level