Resolves #68, somewhat
Fixes #102
Fixes #107
Fixes #108