Fixed review issues. closes #97