bugfixes in user and toolkit