Fixed things that were previously "working" f yeah.