Some Bugfixes #122