Revert "A handful of changes!"

This reverts commit 4212351195bdd10942581d285227fee0908fac0f.
Revert "Revert "A handful of changes!""

This reverts commit 6db0e4d195180edecbae4a5832f2a540e7967bd0.
Merge remote-tracking branch 'origin/master'