Some fixes and requirements.txt