bug-fixes and polish. OrderNetwork now works as originally intended.