small fixes
small fixes
installation as one ocamlfind package
merge