Fix I/O options and tidy up doc strings