user interaction improvements, small bugfixes