Clean up all the mess, and just call it v1.2