Fixing requirements and makefile