cleaned up some issues with order transactions