more cap tweaks