last update, bad / conflicting shortcuts removed.