Updated readme, and a few fixes