v2.1 some bug fixes