Added more comments and changed others