GAC samples and slight cleanup