fixng some things