added currentLocationController / toString method / ...