Shortcut improved, bugfixes, ...