fixing more things hooray!