Not finished updating yet, still catching bugs, drawSpectrum method fixed and altered other methods format