Main: Validation fixes and some minor cleanup of small to .de-em.