finished the code review stuff.
merged