reworked term dropping; warnings now more accurate