update to latest; remove global app option; other cleanup