fixed #3
final bugfixes