diff --git a/EightBit.sln b/EightBit.sln
index d9a756c..f1e8aec 100644
--- a/EightBit.sln
+++ b/EightBit.sln
@@ -30,9 +30,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_MC6809", "MC6809\test\test_MC6809.vcxproj", "{80412055-64FB-417B-B017-EBF92770C922}"
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
diff --git a/MC6809/inc/Disassembly.h b/MC6809/inc/Disassembly.h
index 5bbd780..a49a536 100644
--- a/MC6809/inc/Disassembly.h
+++ b/MC6809/inc/Disassembly.h
@@ -48,6 +48,8 @@ namespace EightBit {
 
 		std::string Address_indexed(std::string mnemomic);
 
+		std::string AM_immediate_word(std::string mnemomic);
+
 		std::string dump_Byte(uint16_t address);
 		std::string dump_DByte(uint16_t address);
 		std::string dump_Word(uint16_t address);
diff --git a/MC6809/src/Disassembly.cpp b/MC6809/src/Disassembly.cpp
index 38c39a9..712f4dc 100644
--- a/MC6809/src/Disassembly.cpp
+++ b/MC6809/src/Disassembly.cpp
@@ -125,7 +125,7 @@ std::string EightBit::Disassembly::disassembleUnprefixed() {
 
 	std::ostringstream output;
 
-	const auto opcode = CPU().BUS().peek(m_address);
+	const auto opcode = getByte(m_address);
 	output << dump_ByteValue(opcode);
 
 	switch (opcode) {
@@ -310,7 +310,7 @@ std::string EightBit::Disassembly::disassembleUnprefixed() {
 	//case 0xfe:	U() = ld(AM_extended_word());						break;		// LD (LDU extended)
 
 	//// LDX
-	//case 0x8e:	X() = ld(AM_immediate_word());						break;		// LD (LDX immediate)
+	case 0x8e:	output << AM_immediate_word("LDX");	break;	// LD (LDX immediate)
 	//case 0x9e:	X() = ld(AM_direct_word());							break;		// LD (LDX direct)
 	//case 0xae:	X() = ld(AM_indexed_word());						break;		// LD (LDX indexed)
 	//case 0xbe:	X() = ld(AM_extended_word());						break;		// LD (LDX extended)
@@ -500,7 +500,7 @@ std::string EightBit::Disassembly::disassemble10() {
 
 	std::ostringstream output;
 
-	const auto opcode = CPU().BUS().peek(m_address);
+	const auto opcode = getByte(m_address);
 	output << dump_ByteValue(opcode);
 
 	switch (opcode) {
@@ -575,7 +575,7 @@ std::string EightBit::Disassembly::disassemble11() {
 
 	std::ostringstream output;
 
-	const auto opcode = CPU().BUS().peek(m_address);
+	const auto opcode = getByte(m_address);
 	output << dump_ByteValue(opcode);
 
 	switch (opcode) {
@@ -625,13 +625,11 @@ std::string EightBit::Disassembly::Address_indexed(std::string mnemomic) {
 
 	std::ostringstream output;
 
-	auto& bus = CPU().BUS();
-
-	const auto type = bus.peek(++m_address);
+	const auto type = getByte(++m_address);
 	const auto r = RR((type & (Processor::Bit6 | Processor::Bit5)) >> 5);
 
-	auto byte = 0xff;
-	auto word = 0xffff;
+	uint8_t byte = 0xff;
+	uint16_t word = 0xffff;
 
 	output << dump_ByteValue(type);
 
@@ -639,52 +637,63 @@ std::string EightBit::Disassembly::Address_indexed(std::string mnemomic) {
 		const auto indirect = type & Processor::Bit4;
 		switch (type & Processor::Mask4) {
 		case 0b0000:	// ,R+
-			output << mnemomic << " ," << r << "+";
+			output << "\t" << mnemomic << "\t," << r << "+";
 			break;
 		case 0b0001:	// ,R++
-			output << mnemomic << " ," << r << "++";
+			output << "\t" << mnemomic << "\t," << r << "++";
 			break;
 		case 0b0010:	// ,-R
-			output << mnemomic << " ,-" << r;
+			output << "\t" << mnemomic << "\t,-" << r;
 			break;
 		case 0b0011:	// ,--R
-			output << mnemomic << " ,--" << r;
+			output << "\t" << mnemomic << "\t,--" << r;
 			break;
 		case 0b0100:	// ,R
-			output << mnemomic << " ," << r;
+			output << "\t" << mnemomic << "\t," << r;
 			break;
 		case 0b0101:	// B,R
-			output << mnemomic << " B," << r;
+			output << "\t" << mnemomic << "\tB," << r;
 			break;
 		case 0b0110:	// A,R
-			output << mnemomic << " A," << r;
+			output << "\t" << mnemomic << "\tA," << r;
 			break;
 		case 0b1000:	// n,R (eight-bit)
-			byte = bus.peek(++m_address);
-			output << mnemomic << " " << dump_Byte(byte) << "," << r;
+			byte = getByte(++m_address);
+			output
+				<< dump_ByteValue(byte)
+				<< "\t" << mnemomic << "\t"
+				<< dump_ByteValue(byte) << "," << r;
 			break;
 		case 0b1001:	// n,R (sixteen-bit)
-			word = bus.peekWord(++m_address);
-			output << dump_WordValue(word) << "\t";
-			output << mnemomic << " " << dump_Word(word) << "," << r;
+			word = getWord(++m_address);
+			output
+				<< dump_WordValue(word)
+				<< "\t" << mnemomic << "\t"
+				<< dump_WordValue(word) << "," << r;
 			break;
 		case 0b1011:	// D,R
-			output << mnemomic << " D," << r;
+			output << "\t" << mnemomic << "\tD," << r;
 			break;
 		case 0b1100:	// n,PCR (eight-bit)
-			byte = bus.peek(++m_address);
-			output << dump_ByteValue(byte) << "\t";
-			output << mnemomic << " " << dump_RelativeValue((int8_t)byte) << ",PCR";
+			byte = getByte(++m_address);
+			output
+				<< dump_ByteValue(byte)
+				<< "\t" << mnemomic << "\t"
+				<< dump_RelativeValue((int8_t)byte) << ",PCR";
 			break;
 		case 0b1101:	// n,PCR (sixteen-bit)
-			word = bus.peekWord(++m_address);
-			output << dump_WordValue(word) << "\t";
-			output << mnemomic << " " << dump_Word(word) << ",PCR";
+			word = getWord(++m_address);
+			output
+				<< dump_WordValue(word)
+				<< "\t" << mnemomic << "\t"
+				<< dump_RelativeValue((int16_t)word) << ",PCR";
 			break;
 		}
 	} else {
 		// EA = ,R + 5-bit offset
-		output << mnemomic << dump_Byte(type & Processor::Mask5) << "," << r;
+		output
+			<< "\t" << mnemomic << "\t"
+			<< dump_Byte(type & Processor::Mask5) << "," << r;
 }
 
 	return output.str();
@@ -692,12 +701,24 @@ std::string EightBit::Disassembly::Address_indexed(std::string mnemomic) {
 
 ////
 
+std::string EightBit::Disassembly::AM_immediate_word(std::string mnemomic) {
+	std::ostringstream output;
+	const auto word = getWord(++m_address);
+	output
+		<< dump_WordValue(word)
+		<< "\t" << mnemomic << "\t"
+		<< "#" << dump_WordValue(word);
+	return output.str();
+}
+
+////
+
 uint8_t EightBit::Disassembly::getByte(uint16_t address) {
 	return CPU().BUS().peek(address);
 }
 
 uint16_t EightBit::Disassembly::getWord(uint16_t address) {
-	return CPU().BUS().peekWord(address);
+	return CPU().peekWord(address).word;
 }
 
 ////