gah fix some stuff, cleanup indexing