fixed a few derps, now compiles correctly