Add more media forms, more tidyups