generalise messages
remove site mail variable
update features format