tidied up modes, getting ready to debug core