v2.1

few small fixes