upgrade to rust 2018 and some other fixes