Fixes to mount module

Each line can have any number of optional parameters, we use the location of the seperator field to determine the location of the elements after it. #18874