more things to fixxxxxxx