+organize: more comments and a bug fix