Validation fixed, slight tidy
Finally got courses working basically!