bug fixes, extra wasabi options