correct paths and such