adding users index, other tweeks