sorting implemented, empty entries, bugfixes