Added a lot of fixes