Makefile
fix-config-path
improve_error_message
