more fixes to cap