"Vector-1" bug fixed. Some final fixes