updated cargo.toml and minor fixes