bugfixing to come
merge