fixes and DC changes