#261 ongoing bugfixing