NPE fixed when location wasn't ready
minor rename tweaks