changes merged manually, settings & location service mostly functional