Some improvements, from #113