Makefiles
String testing and fixes