Various

- Recipe Tweaks
- Bug Fixes
- Clean Up