More inventory work, fix one packet, misc cleanup