argc/v work, some Picaso changes