tidy up and start fix up.