Issue #7, #10, #11 en #13 fixed.