wok keywords dynamics, minor improvements