Added requirements.txt and Makefile
Do not set a value if there is no name specified
Some tweaks