more comments and small changes