Made all of the dynamic arrays into vectors, corrected some header includes,