Last minute stuff and a bit more tidy up