Fixes #6, #5, #3, #2 and #1