Merge pull request #613 from SiegeLord/even_more_rust_updates