Resolved shipping and tax issue

Resolved shipping and tax issue