Updated Agency info and a few fixes.