add review and lots and lots of stuff
changes from a while back