v2.1 - several fixes