Fixed a lot of requests and bugs