Tidy up and some small features added