v.0.6.6 (rev 2), further minor optimisations