Issue #6, #7 & #10 (Robert)