Fix menu error
Added delivery point and order association
Added better errors
Fixing merge conflicts with master