CSP1150 A1: fixing comments and javadocs
CSP1150 A1: fixed more comments, javadocs
Merge branch 'rewrite'