Feature/index betterification

nothing special. i'm losing focus, so i'll merge for now and get back to it later.