Work some more on fixing errors