aap and Sergeanur CEntity and C(Vu)Vector fixes and cleanup