spoke with the HQ today and was assured my refund for both the 1 extra day and fuel surcharge was to be sent out today (was told last Fri when I called its only done on Thurs).

seems that after my call they did some checking up and decided the system as it was was prone to mistakes. So supposingly they now have the fuel surcharge included in the rate

Ill find out on Sun when I go back there, at least PCCA (the parent company) said they will take care of me if its not correct and refund me, actually she was happy I was going back so this way they can know for sure if the corrections were made as they asked the locations to do so.