Patch: Optimization, quick loading of locations, bug fixes!