v2.1 beta2

Some bug fixes