some improvements and index links