specs for courses and some cleanup