Update

some Bugfixes