Many little adjustment & bugfixes