javadoc fixes
typo!
pretty serious typos
Merge master, make names of stages consistent