Should correct #110
Fixes #935
Fixes #536
Fixes #310
Fixes #536