tweaks to 12
Merge branch 'varjo2merge' of github.com:cbaggers/cepl into varjo2merge