clean up warnings
first attempt to increase performance of index all