Multidir review1

A random set of review related changes for the multidir branch.