more fixes, got shortcuts working