more comments, fixed a bug