Updated with new fixes

Figuring out the DATA/ADDR toggle swtich code slowly...