Standalone, makefile improvements