--- a/code_part1/OSTC_code_asm_part1/aa_wordprocessor.asm	Sat Dec 11 16:23:43 2010 +0100
+++ b/code_part1/OSTC_code_asm_part1/aa_wordprocessor.asm	Sat Dec 11 19:13:26 2010 +0100
@@ -281,20 +281,20 @@
 ; Trashed: PROD
 ;
 aa_box_cmd:
-			AA_CMD_WRITE	0x35		; this is the left border
 			movf	win_leftx2,W,BANKED	; Compute left = 2*leftx2
 			mullw	2
+			AA_CMD_WRITE	0x35		; this is the left border
 			AA_DATA_WRITE_PROD
 
 			movf	aa_width,W,BANKED	; right = left + width - 1
 			addwf	PRODL,F,A
 			movf	aa_width+1,W,BANKED
 			addwfc	PRODH,F,A
-			AA_CMD_WRITE	0x36		; Write and the right border
 			decf	PRODL,F,A			; decrement result
 			bc		aa_box_cmd_1		; No borrow (/Carry) ? skip propagating.
 			decf	PRODH,F,A
 aa_box_cmd_1:			
+			AA_CMD_WRITE	0x36		; Write and the right border
 			AA_DATA_WRITE_PROD
 
 			movf	win_top,W,BANKED	; Write top / bottom window
@@ -303,18 +303,16 @@
 			decf	WREG,A
 			movwf	PRODL,A				; And PRODL is later...
 			AA_CMD_WRITE	0x37
-			nop
-			nop
 			AA_DATA_WRITE_PROD
 
+			movf	win_top,W,BANKED	; Start ptr top
+			mullw	1					; Load into PRODH:L
 			AA_CMD_WRITE	0x20
+			AA_DATA_WRITE_PROD
+
 			movf	win_leftx2,W,BANKED	; Start ptr left
 			mullw	2
-			AA_DATA_WRITE_PROD
-
 			AA_CMD_WRITE	0x21
-			movf	win_top,W,BANKED	; Start ptr top
-			mullw	1					; Load into PRODH:L
 			AA_DATA_WRITE_PROD
 
 			return
@@ -443,7 +441,7 @@
 			; Are we done ?
 			movf	TBLPTRL,W,A			; Compare TBLPTR to aa_end
 			cpfseq	aa_end,BANKED
-			bra		aa_decode_1	; Loop if LOW is different
+			bra		aa_decode_1         ; Loop if LOW is different
 			movf	TBLPTRH,W,A
 			cpfseq	aa_end+1,BANKED		; Loop to if HIGH is different
 			bra		aa_decode_1