Command fixes, and response fixes!