review
updates and fixes