Added config, updated location system