Fixes #12
Fixes #10
Fixes #7
Fixes #2
Fixes #1