gen circle key nearly done, fixes