new entries, improve formatting