Recipe redesign, some bugfixes