Various modification and updates.