Final commit, with all tweaks completed

May 9, 2013