cms updates, beginning to work through other errors