cleaned up order flow some more