cleanup..
fixed #3, simplified the sorting...
changelog