collapse space in class attribute
add missing templates; fix slide notes; tweaks