Pjl misc

Fix #20