update with 2.1.1 changes

ok beck@