re-locate
updates/fixes