code cleanup, early type defs fixed, annotations fixed, primary class constructor parameters printing fixed, xml printing fixed