Fix and add shortcuts
Start today lecture
Merge branch 'fixes'