all of evin's fixes