improved vector types etc.