Minor changes, fixed up new C* storage methods to handle data.