add comment and some other small changes