bugfixing & finetuning
Merge