small updates from feedback
Merge branch 'review'