#134
Fixes #123
Fixes #132
Fixes #135