fixed more index mistakes