bugfixes in order and bill