improve six practice and shell practice
use git's diff to get more helpful word diffs