some lib mods and rework on mount code.