Renamed locations to nodes, added more nodes