Made DB indexes better, updated commontator