reorganized, entrylist writing reimplemented