Some general tidying up and add books