update facility info with mopup data, added short_id in nmis data, updated a few variable names and added "%" to percentage variables