minor fixes and updated to latest Rust