Fixes #1
Fixes #2
Fixes #5