fixes that made it all work