song2: stick: minor fixes.