fixing some things 8