re-organized, added disassembler