Many many fixes and new object class and CA text.