added comments, reordered methods, RC1