More genetics, code cleanup