little changes on order the comments