fixing some things 7