Fixed warnings + javadoc