trying to fix some things...