Simplify usage of copyCount
Fix up some javadoc errors
Merge branch 'master' of ssh://origin