merge a few things from #59