some course fixes
More like Stuart said for 213 layout