--- M6502/Orao.pm	2007/07/31 12:57:35	52
+++ M6502/Orao.pm	2007/07/31 15:03:23	56
@@ -3,15 +3,15 @@
 use warnings;
 use strict;
 
-use Carp;
+use Carp qw/confess/;
 use lib './lib';
 #use Time::HiRes qw(time);
 use File::Slurp;
 use Data::Dump qw/dump/;
 use M6502;
 
-use base qw(Class::Accessor M6502 Screen);
-__PACKAGE__->mk_accessors(qw(debug trace run_for mem_dump trace));
+use base qw(Class::Accessor M6502 Screen Prefs);
+__PACKAGE__->mk_accessors(qw(run_for));
 
 =head1 NAME
 
@@ -33,7 +33,7 @@
 
 =head2 init
 
-Start emulator
+Start emulator, open L<Screen>, load initial ROM images, and render memory
 
 =cut
 
@@ -46,7 +46,7 @@
 	warn "Orao calling upstream init\n";
 	$self->SUPER::init( $self, @_ );
 
-	warn "Orao $Orao::VERSION emulation starting\n", dump( $self );
+	warn "Orao $Orao::VERSION emulation starting\n";
 
 	$self->open_screen;
 	$self->load_rom({
@@ -287,7 +287,7 @@
 	}
 
 	if ( $addr > 0xafff ) {
-		confess sprintf "write access %04x > afff aborting\n", $self, $addr;
+		confess sprintf "write access 0x%04x > 0xafff aborting\n", $addr;
 	}
 
 	$self->mmap_pixel( $addr, $byte, 0, 0 );