Add more things for parsing CAP commands. Still broken though