added changes from Mark Wilkinson to support mount options, list all