moy/minor-improvements archive