Comments modification and check host array length fix