Fix and improve the opam file