fix up issues

Hello,

I have fixed it up so it works with the latest commerce, I was having problems getting it to add `#prefix` and `#suffix` so I removed these and set it to update fieldset.

It was also not returning the entire order object from `form_state['order']` so I made it load the entire order (this was causing problems with the shipping line item not being deleted fully.