diff --git a/siteupdate/cplusplus/Makefile b/siteupdate/cplusplus/Makefile
index 1bdaf521..0e904de2 100644
--- a/siteupdate/cplusplus/Makefile
+++ b/siteupdate/cplusplus/Makefile
@@ -1,3 +1,6 @@
+CXX = clang++
+CXXFLAGS = -std=c++11 -Wno-comment -Wno-dangling-else -Wno-logical-op-parentheses
+
 MTObjects = siteupdateMT.o functions/sql_fileMT.o threads/threads.o \
   classes/GraphGeneration/HighwayGraphMT.o \
   classes/WaypointQuadtree/WaypointQuadtreeMT.o \
@@ -43,24 +46,36 @@ CommonObjects = \
 .PHONY: all clean
 all: siteupdate siteupdateST
 
-%MT.d: %.cpp ; g++ -std=c++11 -MM -D threading_enabled $< | sed -r "s~.*:~$*MT.o:~" > $@
-%ST.d: %.cpp ; g++ -std=c++11 -MM $< | sed -r "s~.*:~$*ST.o:~" > $@
-%.d  : %.cpp ; g++ -std=c++11 -MM $< | sed -r "s~.*:~$*.o:~" > $@
+%MT.d: %.cpp
+	@echo $@
+	@$(CXX) $(CXXFLAGS) -MM -D threading_enabled $< | sed -r "s~.*:~$*MT.o:~" > $@
+%ST.d: %.cpp
+	@echo $@
+	@$(CXX) $(CXXFLAGS) -MM $< | sed -r "s~.*:~$*ST.o:~" > $@
+%.d  : %.cpp
+	@echo $@
+	@$(CXX) $(CXXFLAGS) -MM $< | sed -r "s~.*:~$*.o:~" > $@
 
 -include $(MTObjects:.o=.d)
 -include $(STObjects:.o=.d)
 -include $(CommonObjects:.o=.d)
 
-%MT.o: ; g++ -std=c++11 -o $@ -D threading_enabled -c $<
-%ST.o: ; g++ -std=c++11 -o $@ -c $<
-%.o  : ; g++ -std=c++11 -o $@ -c $<
+%MT.o:
+	@echo $@
+	@$(CXX) $(CXXFLAGS) -o $@ -D threading_enabled -c $<
+%ST.o:
+	@echo $@
+	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+%.o:
+	@echo $@
+	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
 siteupdate: $(MTObjects) $(CommonObjects)
-	@echo Linking siteupdate...
-	@g++ -std=c++11 -pthread -o siteupdate $(MTObjects) $(CommonObjects)
+	@echo $@
+	@$(CXX) $(CXXFLAGS) -pthread -o siteupdate $(MTObjects) $(CommonObjects)
 siteupdateST: $(STObjects) $(CommonObjects)
-	@echo Linking siteupdateST...
-	@g++ -std=c++11 -o siteupdateST $(STObjects) $(CommonObjects)
+	@echo $@
+	@$(CXX) $(CXXFLAGS) -o siteupdateST $(STObjects) $(CommonObjects)
 
 clean:
 	@rm -f $(MTObjects)       $(STObjects)       $(CommonObjects)
diff --git a/siteupdate/cplusplus/siteupdate.cpp b/siteupdate/cplusplus/siteupdate.cpp
index ed7b3e40..4c281aee 100644
--- a/siteupdate/cplusplus/siteupdate.cpp
+++ b/siteupdate/cplusplus/siteupdate.cpp
@@ -374,7 +374,7 @@ int main(int argc, char *argv[])
       #endif
 	TravelerList::ids.clear();
 	TravelerList::listupdates.clear();
-	cout << endl << et.et() << "Processed " << TravelerList::allusers.size() << " traveler list files." << endl;
+	cout << endl << et.et() << "Processed " << TravelerList::allusers.size() << " traveler list files. Sorting and numbering." << endl;
 	TravelerList::allusers.sort(sort_travelers_by_name);
 	// assign traveler numbers for master traveled graph
 	unsigned int travnum = 0;
diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py
index 9079caa8..e7bcf907 100755
--- a/siteupdate/python-teresco/siteupdate.py
+++ b/siteupdate/python-teresco/siteupdate.py
@@ -3119,7 +3119,7 @@ def run(self):
         traveler_lists.append(TravelerList(t,update,el,args.userlistfilepath))
 del traveler_ids
 del listupdates
-print('\n' + et.et() + "Processed " + str(len(traveler_lists)) + " traveler list files.")
+print('\n' + et.et() + "Processed " + str(len(traveler_lists)) + " traveler list files. Sorting and numbering.")
 traveler_lists.sort(key=lambda TravelerList: TravelerList.traveler_name)
 # assign traveler numbers
 travnum = 0