Tidy and updates to info