minor changes; added some primitive vectors