Clean up
Fixed *vec1 scalar constructor