Fixes #66
Fixes #67
Fixes #61