A few changes
Merge branch 'master' of https://github.com/YEI-jacob-w/Tastiii