small fix
some vecwrapper cleanup
more vecwrapper cleanup