umount added, mount of duplicated filename fix, major code cleaning