minor improvements in sakura and related stuff.