formatting
tweaking the makefile to not build singletons by default