minor fixes + fix full plain text derive