Some tidying, start correcting p_ptr->stage