Clean up and finalize latest commits.
derp