OPAM improvements

Any or all of these changes are up for discussion.