LocationInformation refactored, still some little issues