Mount export, bug fixes, scanner tweak, cleanup