subjects, minor fixes