some small bugfixing while testing the current click-features
some small bugfixing