v2.1 -bug fixes