Add changes to the requirements and other fixes.