Updated Review Style and Fixed Some Bugs