Fixed sorting, added todo note