Fix Makefile, update requirements.txt