import and location bug fixes