Tidying up and updating readme todos