Cleanup and updating to 1.06