diff --git a/dkarm-eabi/crtls/ds_arm9_crt0.s b/dkarm-eabi/crtls/ds_arm9_crt0.s
index aa60c3f..1fa17ce 100644
--- a/dkarm-eabi/crtls/ds_arm9_crt0.s
+++ b/dkarm-eabi/crtls/ds_arm9_crt0.s
@@ -1,3 +1,9 @@
+@---------------------------------------------------------------------------------
+@ DS processor selection
+@---------------------------------------------------------------------------------
+	.arch	armv5te
+	.cpu	arm946e-s
+@---------------------------------------------------------------------------------
 #define PAGE_4K		(0b01011 << 1)
 #define PAGE_8K		(0b01100 << 1)
 #define PAGE_16K	(0b01101 << 1)
@@ -32,6 +38,8 @@
 #define DCACHE_ENABLE	(1<<2)
 #define PROTECT_ENABLE	(1<<0)
 
+	.equ	_libnds_argv,0x027FFF70
+
 @---------------------------------------------------------------------------------
 	.section ".init"
 	.global _start
@@ -129,7 +137,7 @@ _start:
 	@-------------------------------------------------------------------------
 	@ Write buffer enable
 	@-------------------------------------------------------------------------
-	ldr	r0,=0b00000110
+	ldr	r0,=0b00000010
 	mcr	p15, 0, r0, c3, c0, 0
 
 	@-------------------------------------------------------------------------
@@ -181,6 +189,8 @@ _start:
 	ldr	r4, =__dtcm_end
 	bl	CopyMemCheck
 
+	bl	checkARGV		@ check and process argv trickery
+
 	ldr	r0, =__bss_start	@ Clear BSS section
 	ldr	r1, =__bss_end
 	sub	r1, r1, r0
@@ -190,23 +200,32 @@ _start:
 	ldr	r1, =__sbss_end
 	sub	r1, r1, r0
 	bl	ClearMem
-
+	
 	ldr	r1, =fake_heap_end	@ set heap end
 	ldr	r0, =__eheap_end
 	str	r0, [r1]
-	
+
 	ldr	r3, =__libc_init_array	@ global constructors
-	bl	_call_via_r3
+	blx	r3
 
 	ldr	r3, =initSystem
-	bl	_call_via_r3		@ jump to user code
+	blx	r3			@ jump to user code
+
+	ldr	r0, =_libnds_argv
+
+	@ reset heap base
+	ldr	r2, [r0,#20]		@ newheap base
+	ldr	r1,=fake_heap_start
+	str	r2,[r1]
+
+	ldr	r1, [r0,#16]		@ argv
+	ldr	r0, [r0,#12]		@ argc
+
 
-	mov	r0, #0			@ int argc
-	mov	r1, #0			@ char *argv[]
 	ldr	r3, =main
-	bl	_call_via_r3		@ jump to user code
+	blx	r3			@ jump to user code
 		
-	@ If the user ever returns, go to an infinte loop
+	@ If the user ever returns, go back to passme loop
 	ldr	r0, =ILoop
 	ldr	r0, [r0]
 	ldr	r1, =0x027FFE78
@@ -215,6 +234,56 @@ _start:
 ILoop:
 	b	ILoop
 
+@---------------------------------------------------------------------------------
+@ check for a commandline 
+@---------------------------------------------------------------------------------
+checkARGV:
+@---------------------------------------------------------------------------------
+	ldr	r0, =_libnds_argv	@ argv structure
+	mov	r1, #0
+	str	r1, [r0,#12]		@ clear argc
+	str	r1, [r0,#16]		@ clear argv
+	
+	ldr	r1, [r0]		@ argv magic number
+	ldr	r2, =0x5f617267		@ '_arg'
+	cmp	r1, r2
+	bxne	lr			@ bail out if no magic
+	
+	ldr	r1, [r0, #4]		@ command line address
+	ldr	r2, [r0, #8]		@ length of command line
+
+	@ copy to heap
+	ldr	r3, =__end__		@ initial heap base
+	str	r3, [r0, #4]		@ set command line address
+
+	cmp	r2, #0
+	subnes	r4, r3, r1		@ dst-src
+	bxeq	lr			@ dst == src || len==0 : nothing to do.
+	
+	cmphi	r2, r4			@ len > (dst-src)
+	bhi	.copybackward
+
+.copyforward:		
+	ldrb	r4, [r1], #1
+	strb	r4, [r3], #1
+	subs	r2, r2, #1
+	bne	.copyforward
+	b	.copydone
+
+.copybackward:
+	subs	r2, r2, #1
+	ldrb	r4, [r1, r2]
+	strb	r4, [r3, r2]
+	bne	.copybackward
+
+.copydone:
+	push	{lr}
+	ldr	r3, =build_argv
+	blx	r3
+	pop	{lr}
+	bx	lr	
+
+
 @---------------------------------------------------------------------------------
 @ Clear memory to 0x00 if length != 0
 @  r0 = Start Address
@@ -263,6 +332,7 @@ CIDLoop:
 	bne	CIDLoop
 
 	bx	lr
+
 @---------------------------------------------------------------------------------
 	.align
 	.pool