fixed remaining shortcuts