Tweaks
Revert "Tweaks"

This reverts commit 543ccaf1987dd0e85ff697a07f01e91c35b4d194.
Merge origin/master
Final commit, hopefully