fixed entries order, lemmas, and removed empty entries