various changes before vector code release

some changes from other forks as well