Revert "some slight changes I made last night"

This reverts commit 572752730ad32768614805127fd06280be712b8a.
Revert "More changes"

This reverts commit ef4246be4f09066e9c8c8e84fc7a339d84b98a82.