Fix a bunch of my retarded code