Update requirements and many fixes