nick handling is improved, nicks are now better sorted
merge