Made most of the updates. Not sure I'm going to continue with rust - moving to haskell!