more entries, fixes