sort stuff
fixed bug stuff