Update readme plus some other fixes