Review stuff

lots of stuff done!