fixed diagram generation
fixed errors in pivot_kick