23082013 bug fixes and javadoc updated