Switched to real location from GPS, added comments