requirements.txt and few fixes