other things fixed