review and additional comments. fix asap