README and a little cleanup