Further excerpt improvements