Issue #1, #5, #6, #9 and #11