better editing, lots of new entries