Fixes for merge with Master

- Bug Fixes
- Style Guidelines
- UsePF refactoring
- Efficiency in code!
- relaxing of use/pour/mix NOT IMPLEMENTED