More changes, work on recipe running