Fix AI bugs + Organization