had to fix some things