Big fixes to how while stores its stack data