Fix
Major bug fixing and recipe improvements