Fix class initilization exceptions and javadoc isues