cleaned up lists, reorderd