General fix of paths, fix vector class
vector works 'better'