More tidying up, but something is up with the API