Fixes #14
Fixes #16
Fixes #15