Smaller enchancements,

Better e-mail filtermins, improved input handling, English comments.