minor improvements in sakura.