better indexing and fixed display somewhat