tried to fix some things