Ocaml 402

Fix a bunch of minor stuff.