tidy up misc fixs