further enhancing / bugfixing