some things fixed