Improvement on cdn fallback and some helpfull comments