split out capabilities from site plus a few fixes