Fixes #2
Fixes #13
Fixes #14