added agencies and cleaned some other stuff up