Cleaned up initial commit. Fixed bug in vector components