Various fixes/improvements and initial adaptations to store/CE changes in delite and deliteful