Core code updates under way: Pardon any rough edges.