hopefully the final refresh for my fork

after which gui smc should keep me on track.