Tidy up and add more info to /find