Fixes everything almost