Fix model generator.
Fix recipe name
Fix bugs found when testing in live app. Needs more tests before it works properly