trying to fix some fixed some things