Clean up the whole thing; update for #14, #13, and #12