more things fixed