pull latest from dkj/devel