[v2.1] Bug fixes, README