vector fixes and additions