auth fixed, index fixed and improved