begin pulling in disassembly, fix stuff