diff --git a/BaS_GNU/flash.lk b/BaS_GNU/flash.lk
index bbbdbcd..708008d 100644
--- a/BaS_GNU/flash.lk
+++ b/BaS_GNU/flash.lk
@@ -1,5 +1,5 @@
 MEMORY {
-   flash (RX)  : ORIGIN = 0xE0000000, LENGTH = 0xFFFFFFFF
+   flash (RX)  : ORIGIN = 0xE0000000, LENGTH = 0x00200000
    ram (WX) : ORIGIN = 0x1FE00000, LENGTH = 0x00100000		/* target to copy BaS to */
 }
 
@@ -80,6 +80,7 @@ SECTIONS {
 	.bas _Bas_base : AT (ADDR(.text) + SIZEOF(.text))
 	{
 		objs/BaS.o(.text)
-		_bas_length = . - _BaS;
+		_bas_end = ABSOLUTE(.);
 	} > ram
+	
 }
\ No newline at end of file
diff --git a/BaS_GNU/sources/sysinit.c b/BaS_GNU/sources/sysinit.c
index e1bbff3..c9be904 100644
--- a/BaS_GNU/sources/sysinit.c
+++ b/BaS_GNU/sources/sysinit.c
@@ -668,15 +668,13 @@ livo:
 }
 
 void initialize_hardware(void) {
-	extern uint8_t *Bas_base;	/* target address to copy bas to (from linker script) */
-	extern uint8_t *bas;		/* source address to copy bas from (from linker script) FIXME: beware of possible alignment */
-	extern uint32_t bas_length;/* length of BaS code to copy (from linker script) */
-	extern void *BaS;			/* BaS routine to jump to after copy */
+	extern uint32_t bas;		/* source address to copy bas from (from linker script) FIXME: beware of possible alignment */
+	extern uint32_t bas_end;	/* end of BaS code to copy (from linker script) */
+	extern uint32_t BaS;		/* BaS routine to jump to after copy */
 
-	int i;
 	uint32_t *src;
 	uint32_t *dst;
-	uint8_t *jmp;
+	uint32_t *jmp;
 
 	__asm__ __volatile__(
 	"move.l 	#0x000C8120,D0\n\t"
@@ -710,18 +708,18 @@ void initialize_hardware(void) {
 
 	/* copy the BaS code contained in flash to its final location */
 	src = (uint32_t *)&bas;
-	dst = (uint32_t *)&Bas_base;
-	jmp = (uint8_t *)&BaS;
-	for (i = 0; i < (int) &bas_length / 16; i+= 4)
+	dst = jmp = (uint32_t *)&BaS;
+
+	do
 	{
 		*src++ = *dst++;
 		*src++ = *dst++;
 		*src++ = *dst++;
 		*src++ = *dst++;
-	}
+	} while (dst < &bas_end);
 
-	flushDataCacheRegion(&Bas_base, (int) &bas_length);
-	flushInstructionCacheRegion(&Bas_base, (int) &bas_length);
+	flushDataCacheRegion(&BaS, (uint32_t) (&bas_end - &BaS));
+	flushInstructionCacheRegion(&BaS, (uint32_t) (&bas_end - &BaS));
 
 	__asm__ __volatile__(
 		"		move.l	%0,a3		| calculated start address\n\t"