lots of fixes for 2.1.1