v 2.1.9

Various Fixes