Better readme and a couple changes