fixing some things 6