fix mutt, other changes