Fixed old stuff and started looking at how to adjust for memory access