Tried to fix some things