v 2.1.8

Various Fixes