fix mixed location stuff
Text changes