Fixing some shortcut collisions and adding new things