cleanup and item sorting fix