fix for ordering
Updates and fixes