final changes and cleanup to make this work with the Chimp API