Updating manage to be universal, small mods to disk_check