Fixed header file and all vectors