Add more stuff and clean up cargo.field