actually fix the build since do was removed, and fix the makefile