Revert "did more stuff and fixed things"

This reverts commit 1888bee42bcb65dfb0ebec12e02c185a0a284dfd.