-mAdd comments and slight reorganiation of methods for top level classes