Fix typos
Adjust version numbers
adjust archetype for decorator changes
javadoc