A reviewing of the code w/ more commits added.