Eh, moved entity defs into their own thing
Got rid of the return macro
Fixed FPS-locking code