Review with some fixes & stuff.