cleaned up some random stuff. any other changes that I forgot to commit.