Courses now doing Details the new way + some cleanup