wasabi integration, bug fixes