Various Fixes for version 1.1