NodeLocation renamed and clean-up
Marker database added
Dead code removed