things

Also fixed a redefining thing.