stuff keeps breaking
added database indexes