more Capfile tweaks