adding index, fixing fuckups