some things fixed up