Rearrange README and make small changes