tons of edu plugin minor fixes