Implement #78 (as an option)
Fix #79
Fix #80