Fixed api pulling + lineup logic