multifid changes (mostly comments)