Cleanup and upgraded 1.0.12