Remove WaitForKey
Revert to original, extended cpuid addresses.
Fix bugs discovered while testing