Added C objects. Plus cleaned up some.