A lot of fixes
fixes
Did a lot of changes and fixes