Added additional functions to Vector classes.
Fixed merge issues.