Correct #[crate_id =..] and minor changes