Cleanup & fix taxIncluded in shipping