Done pickup location.
Fixed issues #34,35,36,37,38