Minor changes, slow progress...