Finished problem 12 and cleaning up some old changes.