some bugs fixed
more fixes
sorting