added auto-reindexer, fixed some indexing bugs..