More progress on disassembly