added vector class and did some renaming