Use more Vectors and Fix GetMax return type