finished code review - see # REV