oops

had the indicators mixed up. also removed some functionless code.