working on solving review bug; almost done everything else