diff --git a/doc/go_tutorial.txt b/doc/go_tutorial.txt
index 67db2d9..f408625 100644
--- a/doc/go_tutorial.txt
+++ b/doc/go_tutorial.txt
@@ -4,7 +4,7 @@
 Rob Pike
 
 ----
-(September 14, 2008)
+(January 9, 2009)
 
 
 This document is a tutorial introduction to the basics of the Go systems programming
@@ -45,22 +45,24 @@
 to store Unicode strings represented in UTF-8.
 
 The built-in function "print()" has been used during the early stages of
-development of the language but is not guaranteed to last.  Here's a better version of the
+development of the language but is not guaranteed to last.  Here's a version of the
 program that doesn't depend on "print()":
 
 --PROG progs/helloworld2.go
 
 This version imports the ''os'' package to acess its "Stdout" variable, of type
-"*OS.FD".  The "import" statement is a declaration: it names the identifier ("OS")
+"*os.FD".  The "import" statement is a declaration: it names the identifier ("os")
 that will be used to access members of the package imported from the file (&quot;os&quot;),
 found in the current directory or in a standard location.
-Given "OS.Stdout" we can use its "WriteString" method to print the string.
+Given "os.Stdout" we can use its "WriteString" method to print the string.
 
 The comment convention is the same as in C++:
 
 	/* ... */
 	// ...
 
+Later we'll have much more to say about printing.
+
 Echo
 ----
 
@@ -68,7 +70,7 @@
 
 --PROG progs/echo.go
 
-It's still fairly small but it's doing a number of new things.  In the last example,
+This program is small but it's doing a number of new things.  In the last example,
 we saw "func" introducing a function.  The keywords "var", "const", and "type"
 (not used yet) also introduce declarations, as does "import".
 Notice that we can group declarations of the same sort into
@@ -82,9 +84,15 @@
 top-level declaration, even though they are needed as separators <i>within</i>
 a parenthesized list of declarations.
 
-Having imported the "Flag" package, line 8 creates a global variable to hold
-the value of echo's -n flag.  (The nil hides a nice feature not needed here;
-see the source in "src/lib/flag.go" for details).
+Also notice that we've dropped the explicit name from the imports; by default,
+packages are imported using the name defined by the imported package,
+which by convention is of course the file name itself.  You can specify your
+own import names if you want but it's only necessary if you need to resolve
+a naming conflict.
+
+Having imported the "flag" package, line 8 creates a global variable to hold
+the value of echo's "-n" flag. The variable "n_flag" has type "*bool", pointer
+to "bool".
 
 In "main.main", we parse the arguments (line 16) and then create a local
 string variable we will use to build the output.
@@ -106,23 +114,25 @@
 
 	s := "";
 
-The := operator is used a lot in Go to represent an initializing declaration.
-(For those who know Limbo, its := construct is the same, but notice
-that Go has no colon after the name in a full "var" declaration.)
-And there's one in the "for" clause on the next line:
+The ":=" operator is used a lot in Go to represent an initializing declaration.
+(For those who know Limbo, its ":=" construct is the same, but notice
+that Go has no colon after the name in a full "var" declaration.
+Also, for simplicity of parsing, ":=" only works inside functions, not at
+the top level.)
+There's one in the "for" clause on the next line:
 
 --PROG  progs/echo.go /for/
 
-The "Flag" package has parsed the arguments and left the non-flag arguments
+The "flag" package has parsed the arguments and left the non-flag arguments
 in a list that can be iterated over in the obvious way.
 
 The Go "for" statement differs from that of C in a number of ways.  First,
 it's the only looping construct; there is no "while" or "do".  Second,
 there are no parentheses on the clause, but the braces on the body
-are mandatory.  (The same applies to the "if" statement.) Later examples
-will show some other ways "for" can be written.
+are mandatory.  The same applies to the "if" and "switch" statements.
+Later examples will show some other ways "for" can be written.
 
-The body of the loop builds up the string "s" by appending (using +=)
+The body of the loop builds up the string "s" by appending (using "+=")
 the flags and separating spaces. After the loop, if the "-n" flag is not
 set, it appends a newline, and then writes the result.
 
@@ -134,7 +144,7 @@
 
 The "sys" package is built in and contains some essentials for getting
 started; for instance, "sys.argc()" and "sys.argv(int)" are used by the
-"Flag" package to access the arguments.
+"flag" package to access the arguments.
 
 An Interlude about Types
 ----
@@ -142,9 +152,10 @@
 Go has some familiar types such as "int" and "float", which represent
 values of the ''appropriate'' size for the machine. It also defines
 specifically-sized types such as "int8", "float64", and so on, plus
-unsigned integer types such as "uint", "uint32", etc.  And then there
-is a "byte" synonym for "uint8", which is the element type for
-strings.
+unsigned integer types such as "uint", "uint32", etc.  These are
+distinct types; even if "int" and "int32" are both 32 bits in size,
+they are not the same type.  There is also a "byte" synonym for
+"uint8", which is the element type for strings.
 
 Speaking of "string", that's a built-in type as well.  Strings are
 <i>immutable values</i> -- they are not just arrays of "byte" values.
@@ -176,10 +187,25 @@
 about pointers to arrays.
 
 The size of the array is part of its type; however, one can declare
-an <i>open array</i> variable, to which one can assign any array value
-with the same element type.
-(At the moment, only <i>pointers</i> to open arrays are implemented.)
-Thus one can write this function (from "sum.go"):
+a <i>slice</i> variable, to which one can assign any array value
+with the same element type. Slices look a lot like arrays but have
+no explicit size ("[]" vs. "[10]") and they reference a segment of
+an underlying, often anonymous, regular array.  Multiple slices
+can share data if they represent pieces of the same array;
+multiple arrays can never share data.
+
+Slices are actually much more common in Go programs than
+regular arrays; they're more flexible, have reference semantics,
+and are efficient.  What they lack is the precise control of storage
+layout of a regular array; if you want to have a hundred elements
+of an array stored within your structure, you should use a regular
+array.
+
+When passing an array to a function, you almost always want
+to declare the formal parameter to be a slice.  Go will automatically
+create (efficiently) a slice reference and pass that.
+
+Using slices one can write this function (from "sum.go"):
 
 --PROG progs/sum.go /sum/ /^}/
 
@@ -188,27 +214,64 @@
 --PROG progs/sum.go /1,2,3/
 
 Note how the return type ("int") is defined for "sum()" by stating it
-after the parameter list.  Also observe that although the argument
-is a pointer to an array, we can index it directly ("a[i]" not "(*a)[i]").
-The expression "[]int{1,2,3}" -- a type followed by a brace-bounded expression
--- is a constructor for a value, in this case an array of "int". We pass it
-to "sum()" by taking its address.
+after the parameter list.
+The expression "[3]int{1,2,3}" -- a type followed by a brace-bounded expression
+-- is a constructor for a value, in this case an array of 3 "ints". We pass it
+to "sum()" by (automatically) promoting it to a slice.
 
-The built-in function "len()" appeared there too - it works on strings,
-arrays, and maps, which can be built like this:
+If you are creating a regular array but want the compiler to count the
+elements for you, use "..." as the array size:
+
+	s := sum([...]int{1,2,3});
+
+In practice, though, unless you're meticulous about storage layout within a
+data structure, a slice - using empty brackets - is all you need:
+
+	s := sum([]int{1,2,3});
+
+There are also maps, which you can initialize like this:
 
 	m := map[string] int {"one":1 , "two":2}
 
-At least for now, maps are <i>always</i> pointers, so in this example
-"m" has type "*map[string]int".  This may change.
+The built-in function "len()", which returns number of elements,
+makes its first appearance in "sum".  It works on strings, arrays,
+slices, and maps.
 
-You can also create a map (or anything else) with the built-in "new()"
-function:
 
-	m := new(map[string] int)
+An Interlude about Allocation
+----
 
-The "new()" function always returns a pointer, an address for the object
-it creates.
+Most types in Go are values. If you have an "int" or a "struct"
+or an array, assignment
+copies the contents of the object.  To allocate something on the stack,
+just declare a variable.  To allocate it on the heap, use "new()", which
+returns a pointer to the allocated storage.
+
+	type T struct { a, b int }
+	var t *T = new(T);
+
+or the more idiomatic
+
+	t := new(T);
+
+Some types - maps, slices, and channels (see below) have reference semantics.
+If you're holding a slice or a map and you modify its contents, other variables
+referencing the same underlying data will see the modification.  If you allocate
+a reference object with "new()" you receive a pointer to an uninitialized ("nil")
+reference. Instead, for these three types you want to use "make()":
+
+	m := make(map[string] int);
+
+This statement initializes a new map ready to store entries.  If you just declare
+the map, as in
+
+	var m map[string] int;
+
+it is a "nil" reference that cannot hold anything. To use the map,
+you must first initialize the reference using "make()" or by assignment to an
+existing map.
+
+Note that "new(T)" returns type "*T" while "make(T)" returns type "T".
 
 An Interlude about Constants
 ----
@@ -225,16 +288,16 @@
 language specification but here are some illustrative examples:
 
 	var a uint64 = 0  // a has type uint64, value 0
-	a := uint64(0)    // equivalent; uses a "conversion"
+	a := uint64(0)    // equivalent; use a "conversion"
 	i := 0x1234       // i gets default type: int
 	var j int = 1e6   // legal - 1000000 is representable in an int
 	x := 1.5          // a float
-	i3div2 = 3/2      // integer division - result is 1
-	f3div2 = 3./2.    // floating point division - result is 1.5
+	i3div2 := 3/2     // integer division - result is 1
+	f3div2 := 3./2.   // floating point division - result is 1.5
 
-Conversions only work for simple cases such as converting ints of one
-sign or size to another, and between ints and floats, plus a few other
-simple cases.  There are no automatic conversions of any kind in Go,
+Conversions only work for simple cases such as converting "ints" of one
+sign or size to another, and between "ints" and "floats", plus a few other
+simple cases.  There are no automatic numeric conversions of any kind in Go,
 other than that of making constants have concrete size and type when
 assigned to a variable.
 
@@ -247,7 +310,12 @@
 --PROG progs/fd.go /package/ /^}/
 
 The first line declares the name of the package -- "fd" for ''file descriptor'' --
-and then we import the low-level, external "syscall" package, which provides
+and then we import two packages.  The "os" package hides the differences
+between various operating systems to give a consistent view of files and
+so on; here we're only going to use its error handling utilities
+and reproduce the rudiments of its file I/O.
+
+The other item is the low-level, external "syscall" package, which provides
 a primitive interface to the underlying operating system's calls.
 
 Next is a type definition: the "type" keyword introduces a type declaration,
@@ -261,7 +329,18 @@
 --PROG progs/fd.go /NewFD/ /^}/
 
 This returns a pointer to a new "FD" structure with the file descriptor and name
-filled in.  We can use it to construct some familiar, exported variables of type "*FD":
+filled in.  This code uses Go's notion of a ''composite literal'', analogous to
+the ones used to build maps and arrays, to construct the object.  We could write
+
+	n := new(FD);
+	n.fildes = fd;
+	n.name = name;
+	return n
+
+but for simple structures like "FD" it's easier to return the address of a nonce
+composite literal, as is done here on line 17.
+
+We can use the factory to construct some familiar, exported variables of type "*FD":
 
 --PROG progs/fd.go /export.var/ /^.$/
 
@@ -271,19 +350,29 @@
 --PROG progs/fd.go /func.Open/ /^}/
 
 There are a number of new things in these few lines.  First, "Open" returns
-multiple values, an "FD" and an "errno" (Unix error number).  We declare the
-multi-value return as a parenthesized list of declarations.  "Syscall.open"
+multiple values, an "FD" and an error (more about errors in a moment).
+We declare the
+multi-value return as a parenthesized list of declarations; syntactically
+they look just like a second parameter list.  The function
+"syscall.open"
 also has a multi-value return, which we can grab with the multi-variable
 declaration on line 27; it declares "r" and "e" to hold the two values,
 both of type "int64" (although you'd have to look at the "syscall" package
 to see that).  Finally, line 28 returns two values: a pointer to the new "FD"
-and the return code.  If "Syscall.open" failed, the file descriptor "r" will
+and the error.  If "syscall.open" failed, the file descriptor "r" will
 be negative and "NewFD" will return "nil".
 
-Now that we can build "FDs", we can write methods to use them. To declare
+About those errors:  The "os" library includes a general notion of an error
+string, maintaining a unique set of errors throughout the program. It's a
+good idea to use its facility in your own interfaces, as we do here, for
+consistent error handling throughout Go code.   In "Open" we use the
+routine "os.ErrnoToError" to translate Unix's integer "errno" value into
+an error string, which will be stored in a unique instance of "*os.Error".
+
+Now that we can build "FDs", we can write methods for them. To declare
 a method of a type, we define a function to have an explicit receiver
 of that type, placed
-in parentheses before the function name. Here are some methods for "FD",
+in parentheses before the function name. Here are some methods for "*FD",
 each of which declares a receiver variable "fd".
 
 --PROG progs/fd.go /Close/ END
@@ -291,6 +380,12 @@
 There is no implicit "this" and the receiver variable must be used to access
 members of the structure.  Methods are not declared within
 the "struct" declaration itself.  The "struct" declaration defines only data members.
+In fact, methods can be created for any type you name, such as an integer or
+array, not just for "structs".   We'll see an an example with arrays later.
+
+These methods use the public variable "os.EINVAL" to return the ("*os.Error"
+version of the) Unix error code EINVAL.  The "os" library defines a standard
+set of such error values.
 
 Finally, we can use our new package:
 
@@ -306,7 +401,8 @@
 Rotting cats
 ----
 
-Building on the FD package, here's a simple version of the Unix utility "cat(1)", "progs/cat.go":
+Building on the "fd" package, here's a simple version of the Unix utility "cat(1)",
+"progs/cat.go":
 
 --PROG progs/cat.go
 
@@ -319,18 +415,20 @@
 case expressions don't need to be constants or even integers, as long as
 they all have the same type.
 
-Since the "switch" value is just "true", we could leave it off -- as is also true
+Since the "switch" value is just "true", we could leave it off -- as is also
+the situation
 in a "for" statement, a missing value means "true".  In fact, such a "switch"
-is a form of "if-else" chain.
+is a form of "if-else" chain. While we're here, it should be mentioned that in
+"switch" statements each "case" has an implicit "break".
 
-Line 19 calls "Write()" by slicing (a pointer to) the array, creating a
-<i>reference slice</i>.
+Line 19 calls "Write()" by slicing the incoming buffer, which is itself a slice.
+Slices provide the standard Go way to handle I/O buffers.
 
 Now let's make a variant of "cat" that optionally does "rot13" on its input.
 It's easy to do by just processing the bytes, but instead we will exploit
 Go's notion of an <i>interface</i>.
 
-The "cat()" subroutine uses only two methods of "fd": "Read()" and "Name()",
+The "cat()" subroutine uses only two methods of "fd": "Read()" and "String()",
 so let's start by defining an interface that has exactly those two methods.
 Here is code from "progs/cat_rot13.go":
 
@@ -338,9 +436,9 @@
 
 Any type that implements the two methods of "Reader" -- regardless of whatever
 other methods the type may also contain -- is said to <i>implement</i> the
-interface.  Since "FD.FD" implements these methods, it implements the
+interface.  Since "fd.FD" implements these methods, it implements the
 "Reader" interface.  We could tweak the "cat" subroutine to accept a "Reader"
-instead of a "*FD.FD" and it would work just fine, but let's embellish a little
+instead of a "*fd.FD" and it would work just fine, but let's embellish a little
 first by writing a second type that implements "Reader", one that wraps an
 existing "Reader" and does "rot13" on the data. To do this, we just define
 the type and implement the methods and with no other bookkeeping,
@@ -348,7 +446,7 @@
 
 --PROG progs/cat_rot13.go /type.Rot13/ /end.of.Rot13/
 
-(The "rot13" function called on line 38 is trivial and not worth reproducing.)
+(The "rot13" function called on line 37 is trivial and not worth reproducing.)
 
 To use the new feature, we define a flag:
 
@@ -359,8 +457,8 @@
 --PROG progs/cat_rot13.go /func.cat/ /^}/
 
 (We could also do the wrapping in "main" and leave "cat()" mostly alone, except
-for changing the type of the argument.)
-Lines 53 and 54 set it all up: If the "rot13" flag is true, wrap the "Reader"
+for changing the type of the argument; consider that an exercise.)
+Lines 51 through 53 set it all up: If the "rot13" flag is true, wrap the "Reader"
 we received into a "Rot13" and proceed.  Note that the interface variables
 are values, not pointers: the argument is of type "Reader", not "*Reader",
 even though under the covers it holds a pointer to a "struct".
@@ -383,7 +481,7 @@
 This means
 that a type may implement an arbitrary number of different interfaces.
 There is no type hierarchy; things can be much more <i>ad hoc</i>,
-as we saw with "rot13".  "FD.FD" implements "Reader"; it could also
+as we saw with "rot13".  The type "fd.FD" implements "Reader"; it could also
 implement a "Writer", or any other interface built from its methods that
 fits the current situation. Consider the <i>empty interface</i>
 
@@ -406,12 +504,15 @@
 
 --PROG progs/sort.go /interface/ /^}/
 
-We can apply "Sort" to any type that implements "len", "less", and "swap".
+We can apply "Sort" to any type that implements "Len", "Less", and "Swap".
 The "sort" package includes the necessary methods to allow sorting of
-arrays of integers, strings, etc.; here's the code for arrays of "int":
+arrays of integers, strings, etc.; here's the code for arrays of "int"
 
 --PROG progs/sort.go /type.*IntArray/ /swap/
 
+Here we see methods defined for non-"struct" types.  You can define methods
+for any type you define and name in your package.
+
 And now a routine to test it out, from "progs/sortmain.go".  This
 uses a function in the "sort" package, omitted here for brevity,
 to test that the result is sorted.
@@ -421,7 +522,124 @@
 If we have a new type we want to be able to sort, all we need to do is
 to implement the three methods for that type, like this:
 
---PROG progs/sortmain.go /type.Day/ /swap/
+--PROG progs/sortmain.go /type.Day/ /Swap/
+
+
+Printing
+---
+
+The examples of formatted printing so far have been modest.  In this section
+we'll talk about how formatted I/O can be done well in Go.
+
+There's a package "fmt" that implements a version of "printf" that should
+look familiar:
+
+--PROG progs/printf.go
+
+Within the "fmt" package, "printf" is declared with this signature:
+
+	printf(format string, v ...) (n int, errno *os.Error)
+
+That "..." represents the variadic argument list that in C would
+be handled using the "stdarg.h" macros, but in Go is passed using
+an empty interface variable ("interface {}") that is then unpacked
+using the reflection library.  It's off topic here but the use of
+reflection helps explain some of the nice properties of Go's printf,
+due to the ability of "printf" to discover the type of its arguments
+dynamically.
+
+For example, in C each format must correspond to the type of its
+argument.  It's easier in many cases in Go.  Instead of "%llud" you
+can just say "%d"; "printf" knows the size and signedness of the
+integer and can do the right thing for you.  The snippet
+
+--PROG progs/print.go 'NR==6' 'NR==7'
+
+prints
+
+	18446744073709551615 -1
+
+In fact, if you're lazy the format "%v" will print, in a simple
+appropriate style, any value, even an array or structure.  The output of
+
+--PROG progs/print.go 'NR==10' 'NR==13'
+
+is
+
+	18446744073709551615 {77 Sunset Strip} [1 2 3 4]
+
+You can drop the formatting altogether if you use "print" or "println"
+instead of "printf".  Those routines do fully automatic formatting.
+The "print" function just prints its elements out using the equivalent
+of "%v" while "println" automatically inserts spaces between arguments
+and adds a newline.  The output of each of these two lines is identical
+to that of the "printf" call above.
+
+--PROG progs/print.go 'NR==14' 'NR==15'
+
+If you have your own type you'd like "printf" or "print" to format,
+just give it a "String()" method that returns a string.  The print
+routines will examine the value to inquire whether it implements
+the method and if so, use it rather than some other formatting.
+Here's a simple example.
+
+--PROG progs/print_string.go 'NR==5' END
+
+Since "*T" has a "String()" method, the
+default formatter for that type will use it and produce the output
+
+	77 Sunset Strip
+
+Observe that the "String()" method calls "sprint" (the obvious Go
+variant) to do its formatting; special formatters can use the "fmt"
+library recursively.
+
+Another feature of "printf" is that the format "%T" will print a string
+representation of the type of a value, which can be handy when debugging
+polymorphic code.
+
+It's possible to write full custom print formats with flags and precisions
+and such, but that's getting a little off the main thread so we'll leave it
+as an exploration exercise.
+
+You might ask, though, how "printf" can tell whether a type implements
+the "String()" method.  Actually what it does is ask if the value can
+be converted to an interface variable that implements the method.
+Schematically, given a value "v", it does this:
+
+
+	type String interface {
+		String() string
+	}
+
+	s, ok := v.(String);  // Test whether v satisfies "String"
+	if ok {
+		result = s.String()
+	} else {
+		result = default_output(v)
+	}
+
+The code tests if the value stored in
+"v" satisfies the "String" interface; if it does, "s"
+will become an interface variable implementing the method and "ok" will
+be "true".  We then use the interface variable to call the method.
+(The ''comma, ok'' pattern is a Go idiom used to test the success of
+operations such as type conversion, map update, communications, and so on,
+although this is the only appearance in this tutorial.)
+If the value does not satisfy the interface, "ok" will be false.
+
+One last wrinkle.  To complete the suite, besides "printf" etc. and "sprintf"
+etc., there are also "fprintf" etc.  Unlike in C, "fprintf"'s first argument is
+not a file.  Instead, it is a variable of type "io.Write", which is an
+interface type defined in the "io" library:
+
+	export type Write interface {
+		Write(p []byte) (n int, err *os.Error);
+	}
+
+Thus you can call "fprintf" on any type that implements a standard "Write()"
+method, not just files but also network channels, buffers, rot13ers, whatever
+you want.
 
 Prime numbers
 ----
@@ -430,7 +648,7 @@
 It's a big subject so to be brief we assume some familiarity with the topic.
 
 A classic program in the style is the prime sieve of Eratosthenes.
-It works by taking a stream of all the natural numbers, and introducing
+It works by taking a stream of all the natural numbers and introducing
 a sequence of filters, one for each prime, to winnow the multiples of
 that prime.  At each step we have a sequence of filters of the primes
 so far, and the next number to pop out is the next prime, which triggers
@@ -449,9 +667,9 @@
 To create a stream of integers, we use a Go <i>channel</i>, which,
 borrowing from CSP's descendants, represents a communications
 channel that can connect two concurrent computations.
-In Go, channel variables are
-always pointers to channels -- it's the object they point to that
-does the communication.
+In Go, channel variables are references to a run-time object that
+coordinates the communication; as with maps and slices, use
+"make" to create a new channel.
 
 Here is the first function in "progs/sieve.go":
 
@@ -482,7 +700,7 @@
 If you want to know when the calculation is done, pass a channel
 on which it can report back:
 
-	ch := new(chan int);
+	ch := make(chan int);
 	go sum(huge_array, ch);
 	// ... do something else for a while
 	result := <-ch;  // wait for, and retrieve, result
@@ -538,6 +756,9 @@
 
 --PROG progs/server.go /type.BinOp/ /^}/
 
+Line 8 defines the name "BinOp" to be a function taking two integers and
+returning a third.
+
 The "Server" routine loops forever, receiving requests and, to avoid blocking due to
 a long-running operation, starting a goroutine to do the actual work.
 
@@ -556,7 +777,7 @@
 
 One annoyance with this program is that it doesn't exit cleanly; when "main" returns
 there are a number of lingering goroutines blocked on communication.  To solve this,
-we provide a second, "quit" channel to the server:
+we can provide a second, "quit" channel to the server:
 
 --PROG progs/server1.go /func.StartServer/ /^}/
 
diff --git a/doc/prog.sh b/doc/prog.sh
index 8f376b6..26a5908 100755
--- a/doc/prog.sh
+++ b/doc/prog.sh
@@ -20,6 +20,11 @@
 #
 # non-blank lines are annotated with line number in file
 
+# line numbers are printed %.2d to make them equal-width for nice formatting.
+# the format gives a leading 0.  the format %2d gives a leading space but
+# that appears to confuse sanjay's makehtml formatter into bungling quotes
+# because it makes some lines look indented.
+
 echo "<pre> <!-- $* -->"
 
 case $# in
@@ -27,27 +32,31 @@
 	if test "$3" = "END"  # $2 to end of file
 	then
 		awk '
+			function LINE() { printf("%.2d\t%s\n", NR, $0) }
 			BEGIN { printing = 0 }
-			'$2' { printing = 1; print NR "\t" $0; getline }
-			printing { if($0 ~ /./) { print NR "\t" $0 } else { print "" } }
+			'$2' { printing = 1; LINE(); getline }
+			printing { if($0 ~ /./) { LINE() } else { print "" } }
 		'
 	else	# $2 through $3
 		awk '
+			function LINE() { printf("%.2d\t%s\n", NR, $0) }
 			BEGIN { printing = 0 }
-			'$2' { printing = 1; print NR "\t" $0; getline }
-			'$3' && printing { if(printing) {printing = 0; print NR "\t" $0; exit} }
-			printing { if($0 ~ /./) { print NR "\t" $0 } else { print "" } }
+			'$2' { printing = 1; LINE(); getline }
+			'$3' && printing { if(printing) {printing = 0; LINE(); exit} }
+			printing { if($0 ~ /./) { LINE() } else { print "" } }
 		'
 	fi
 	;;
 2)	# one line
 	awk '
-		'$2' { print NR "\t" $0; getline; exit }
+		function LINE() { printf("%.2d\t%s\n", NR, $0) }
+		'$2' { LINE(); getline; exit }
 	'
 	;;
 1)	# whole file
 	awk '
-		{ if($0 ~ /./) { print NR "\t" $0 } else { print "" } }
+		function LINE() { printf("%.2d\t%s\n", NR, $0) }
+		{ if($0 ~ /./) { LINE() } else { print "" } }
 	'
 	;;
 *)
diff --git a/doc/progs/cat.go b/doc/progs/cat.go
index f74faf4..98e4bbf 100644
--- a/doc/progs/cat.go
+++ b/doc/progs/cat.go
@@ -5,40 +5,40 @@
 package main
 
 import (
-	FD "fd";
-	Flag "flag";
+	"fd";
+	"flag";
 )
 
-func cat(fd *FD.FD) {
+func cat(file *fd.FD) {
 	const NBUF = 512;
 	var buf [NBUF]byte;
 	for {
-		switch nr, er := fd.Read(buf); true {
+		switch nr, er := file.Read(buf); true {
 		case nr < 0:
-			print("error reading from ", fd.Name(), ": ", er, "\n");
+			print("error reading from ", file.String(), ": ", er.String(), "\n");
 			sys.exit(1);
 		case nr == 0:  // EOF
 			return;
 		case nr > 0:
-			if nw, ew := FD.Stdout.Write(buf[0:nr]); nw != nr {
-				print("error writing from ", fd.Name(), ": ", ew, "\n");
+			if nw, ew := fd.Stdout.Write(buf[0:nr]); nw != nr {
+				print("error writing from ", file.String(), ": ", ew.String(), "\n");
 			}
 		}
 	}
 }
 
 func main() {
-	Flag.Parse();   // Scans the arg list and sets up flags
-	if Flag.NArg() == 0 {
-		cat(FD.Stdin);
+	flag.Parse();   // Scans the arg list and sets up flags
+	if flag.NArg() == 0 {
+		cat(fd.Stdin);
 	}
-	for i := 0; i < Flag.NArg(); i++ {
-		fd, err := FD.Open(Flag.Arg(i), 0, 0);
-		if fd == nil {
-			print("can't open ", Flag.Arg(i), ": error ", err, "\n");
+	for i := 0; i < flag.NArg(); i++ {
+		file, err := fd.Open(flag.Arg(i), 0, 0);
+		if file == nil {
+			print("can't open ", flag.Arg(i), ": error ", err, "\n");
 			sys.exit(1);
 		}
-		cat(fd);
-		fd.Close();
+		cat(file);
+		file.Close();
 	}
 }
diff --git a/doc/progs/cat_rot13.go b/doc/progs/cat_rot13.go
index 1ef0f64..1868c6f 100644
--- a/doc/progs/cat_rot13.go
+++ b/doc/progs/cat_rot13.go
@@ -5,11 +5,12 @@
 package main
 
 import (
-	FD "fd";
-	Flag "flag";
+	"fd";
+	"flag";
+	"os";
 )
 
-var rot13_flag = Flag.Bool("rot13", false, nil, "rot13 the input")
+var rot13_flag = flag.Bool("rot13", false, "rot13 the input")
 
 func rot13(b byte) byte {
 	if 'a' <= b && b <= 'z' {
@@ -22,8 +23,8 @@
 }
 
 type Reader interface {
-	Read(b []byte) (ret int64, errno int64);
-	Name() string;
+	Read(b []byte) (ret int, err *os.Error);
+	String() string;
 }
 
 type Rot13 struct {
@@ -31,21 +32,19 @@
 }
 
 func NewRot13(source Reader) *Rot13 {
-	r13 := new(Rot13);
-	r13.source = source;
-	return r13
+	return &Rot13{source}
 }
 
-func (r13 *Rot13) Read(b []byte) (ret int64, errno int64) {	// TODO: use standard Read sig?
+func (r13 *Rot13) Read(b []byte) (ret int, err *os.Error) {
 	r, e := r13.source.Read(b);
-	for i := int64(0); i < r; i++ {
+	for i := 0; i < r; i++ {
 		b[i] = rot13(b[i])
 	}
 	return r, e
 }
 
-func (r13 *Rot13) Name() string {
-	return r13.source.Name()
+func (r13 *Rot13) String() string {
+	return r13.source.String()
 }
 // end of Rot13 implementation
 
@@ -53,38 +52,37 @@
 	const NBUF = 512;
 	var buf [NBUF]byte;
 
-	if rot13_flag.BVal() {
+	if *rot13_flag {
 		r = NewRot13(r)
 	}
 	for {
 		switch nr, er := r.Read(buf); {
 		case nr < 0:
-			print("error reading from ", r.Name(), ": ", er, "\n");
+			print("error reading from ", r.String(), ": ", er.String(), "\n");
 			sys.exit(1);
 		case nr == 0:  // EOF
 			return;
 		case nr > 0:
-			nw, ew := FD.Stdout.Write(buf[0:nr]);
+			nw, ew := fd.Stdout.Write(buf[0:nr]);
 			if nw != nr {
-				print("error writing from ", r.Name(), ": ", ew, "\n");
+				print("error writing from ", r.String(), ": ", ew.String(), "\n");
 			}
 		}
 	}
 }
 
 func main() {
-	var bug FD.FD;
-	Flag.Parse();   // Scans the arg list and sets up flags
-	if Flag.NArg() == 0 {
-		cat(FD.Stdin);
+	flag.Parse();   // Scans the arg list and sets up flags
+	if flag.NArg() == 0 {
+		cat(fd.Stdin);
 	}
-	for i := 0; i < Flag.NArg(); i++ {
-		fd, err := FD.Open(Flag.Arg(i), 0, 0);
-		if fd == nil {
-			print("can't open ", Flag.Arg(i), ": error ", err, "\n");
+	for i := 0; i < flag.NArg(); i++ {
+		file, err := fd.Open(flag.Arg(i), 0, 0);
+		if file == nil {
+			print("can't open ", flag.Arg(i), ": error ", err, "\n");
 			sys.exit(1);
 		}
-		cat(fd);
-		fd.Close();
+		cat(file);
+		file.Close();
 	}
 }
diff --git a/doc/progs/echo.go b/doc/progs/echo.go
index 9dc8285..71711bf 100644
--- a/doc/progs/echo.go
+++ b/doc/progs/echo.go
@@ -5,11 +5,11 @@
 package main
 
 import (
-	OS "os";
-	Flag "flag";
+	"os";
+	"flag";
 )
 
-var n_flag = Flag.Bool("n", false, nil, "don't print final newline")
+var n_flag = flag.Bool("n", false, "don't print final newline")
 
 const (
 	Space = " ";
@@ -17,16 +17,16 @@
 )
 
 func main() {
-	Flag.Parse();   // Scans the arg list and sets up flags
+	flag.Parse();   // Scans the arg list and sets up flags
 	var s string = "";
-	for i := 0; i < Flag.NArg(); i++ {
+	for i := 0; i < flag.NArg(); i++ {
 		if i > 0 {
 			s += Space
 		}
-		s += Flag.Arg(i)
+		s += flag.Arg(i)
 	}
-	if !n_flag.BVal() {
+	if !*n_flag {
 		s += Newline
 	}
-	OS.Stdout.WriteString(s);
+	os.Stdout.WriteString(s);
 }
diff --git a/doc/progs/fd.go b/doc/progs/fd.go
index 76b784f..4c3ac15 100644
--- a/doc/progs/fd.go
+++ b/doc/progs/fd.go
@@ -4,21 +4,21 @@
 
 package fd
 
-import Syscall "syscall"
+import (
+	"os";
+	"syscall";
+)
 
 export type FD struct {
-	fildes	int64;	// file descriptor number
-	name	string;	// file name at Open time
+	fildes  int64;  // file descriptor number
+	name    string; // file name at Open time
 }
 
 func NewFD(fd int64, name string) *FD {
 	if fd < 0 {
 		return nil
 	}
-	n := new(FD);
-	n.fildes = fd;
-	n.name = name;
-	return n
+	return &FD{fd, name}
 }
 
 export var (
@@ -27,36 +27,36 @@
 	Stderr = NewFD(2, "/dev/stderr");
 )
 
-export func Open(name string, mode int64, perm int64) (fd *FD, errno int64) {
-	r, e := Syscall.open(name, mode, perm);
-	return NewFD(r, name), e
+export func Open(name string, mode int64, perm int64) (fd *FD, err *os.Error) {
+	r, e := syscall.open(name, mode, perm);
+	return NewFD(r, name), os.ErrnoToError(e)
 }
 
-func (fd *FD) Close() int64 {
+func (fd *FD) Close() *os.Error {
 	if fd == nil {
-		return Syscall.EINVAL
+		return os.EINVAL
 	}
-	r, e := Syscall.close(fd.fildes);
+	r, e := syscall.close(fd.fildes);
 	fd.fildes = -1;  // so it can't be closed again
-	return 0
+	return nil
 }
 
-func (fd *FD) Read(b []byte) (ret int64, errno int64) {
+func (fd *FD) Read(b []byte) (ret int, err *os.Error) {
 	if fd == nil {
-		return -1, Syscall.EINVAL
+		return -1, os.EINVAL
 	}
-	r, e := Syscall.read(fd.fildes, &b[0], int64(len(b)));
-	return r, e
+	r, e := syscall.read(fd.fildes, &b[0], int64(len(b)));
+	return int(r), os.ErrnoToError(e)
 }
 
-func (fd *FD) Write(b []byte) (ret int64, errno int64) {
+func (fd *FD) Write(b []byte) (ret int, err *os.Error) {
 	if fd == nil {
-		return -1, Syscall.EINVAL
+		return -1, os.EINVAL
 	}
-	r, e := Syscall.write(fd.fildes, &b[0], int64(len(b)));
-	return r, e
+	r, e := syscall.write(fd.fildes, &b[0], int64(len(b)));
+	return int(r), os.ErrnoToError(e)
 }
 
-func (fd *FD) Name() string {
+func (fd *FD) String() string {
 	return fd.name
 }
diff --git a/doc/progs/helloworld2.go b/doc/progs/helloworld2.go
index f2b4cae..b409055 100644
--- a/doc/progs/helloworld2.go
+++ b/doc/progs/helloworld2.go
@@ -4,8 +4,8 @@
 
 package main
 
-import OS "os"    // this package contains features for basic I/O
+import "os"    // this package contains features for basic I/O
 
 func main() {
-	OS.Stdout.WriteString("Hello, world; or Καλημέρα κόσμε; or こんにちは 世界\n");
+	os.Stdout.WriteString("Hello, world; or Καλημέρα κόσμε; or こんにちは 世界\n");
 }
diff --git a/doc/progs/helloworld3.go b/doc/progs/helloworld3.go
index f282bce..f6deccc 100644
--- a/doc/progs/helloworld3.go
+++ b/doc/progs/helloworld3.go
@@ -4,14 +4,14 @@
 
 package main
 
-import FD "fd"
+import fd "fd"
 
 func main() {
 	hello := []byte{'h', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '\n'};
-	FD.Stdout.Write(hello);
-	fd,  errno := FD.Open("/does/not/exist",  0,  0);
-	if fd == nil {
-		print("can't open file; errno=",  errno,  "\n");
+	fd.Stdout.Write(hello);
+	file, err := fd.Open("/does/not/exist",  0,  0);
+	if file == nil {
+		print("can't open file; err=",  err.String(),  "\n");
 		sys.exit(1);
 	}
 }
diff --git a/doc/progs/print.go b/doc/progs/print.go
new file mode 100644
index 0000000..ed3f4e2
--- /dev/null
+++ b/doc/progs/print.go
@@ -0,0 +1,20 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import "fmt"
+
+func main() {
+	var u64 uint64 = 1<<64-1;
+	fmt.printf("%d %d\n", u64, int64(u64));
+
+	// harder stuff
+	type T struct { a int; b string };
+	t := T{77, "Sunset Strip"};
+	a := []int{1, 2, 3, 4};
+	fmt.printf("%v %v %v\n", u64, t, a);
+	fmt.print(u64, " ", t, " ", a, "\n");
+	fmt.println(u64, t, a);
+}
diff --git a/doc/progs/print_string.go b/doc/progs/print_string.go
new file mode 100644
index 0000000..47d4a4b
--- /dev/null
+++ b/doc/progs/print_string.go
@@ -0,0 +1,18 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import "fmt"
+
+type T struct { a int; b string }
+
+func (t *T) String() string {
+	return fmt.sprint(t.a) + " " + t.b
+}
+
+func main() {
+	t := &T{77, "Sunset Strip"};
+	fmt.println(t)
+}
diff --git a/doc/progs/printf.go b/doc/progs/printf.go
new file mode 100644
index 0000000..be1ac97
--- /dev/null
+++ b/doc/progs/printf.go
@@ -0,0 +1,11 @@
+// Copyright 2009 The Go Authors.  All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import "fmt"
+
+func main() {
+	fmt.printf("hello, %s\n", "world");
+}
diff --git a/doc/progs/run b/doc/progs/run
index e04c103..ece3fca 100755
--- a/doc/progs/run
+++ b/doc/progs/run
@@ -16,6 +16,9 @@
 	sum.go \
 	sort.go \
 	sortmain.go \
+	print.go \
+	printf.go \
+	print_string.go \
 	sieve.go \
 	sieve1.go \
 	server1.go \
@@ -46,7 +49,7 @@
 
 testit helloworld "" "Hello, world; or Καλημέρα κόσμε; or こんにちは 世界"
 testit helloworld2 "" "Hello, world; or Καλημέρα κόσμε; or こんにちは 世界"
-testit helloworld3 "" "hello, world can't open file; errno=2"
+testit helloworld3 "" "hello, world can't open file; err=No such file or directory"
 testit echo "hello, world" "hello, world"
 testit sum "" "6"
 
@@ -58,6 +61,10 @@
 
 testit sortmain "" "Sunday Monday Tuesday Thursday Friday"
 
+testit print "" "18446744073709551615 -1 18446744073709551615 {77 Sunset Strip} [1 2 3 4] 18446744073709551615 {77 Sunset Strip} [1 2 3 4] 18446744073709551615 {77 Sunset Strip} [1 2 3 4]"
+testit printf "" "hello, world"
+testit print_string "" "77 Sunset Strip"
+
 testitpipe sieve "sed 10q" "2 3 5 7 11 13 17 19 23 29"
 testitpipe sieve "sed 10q" "2 3 5 7 11 13 17 19 23 29"
 
diff --git a/doc/progs/server.go b/doc/progs/server.go
index cdf2b2e..233972f 100644
--- a/doc/progs/server.go
+++ b/doc/progs/server.go
@@ -5,8 +5,8 @@
 package main
 
 type Request struct {
-	a, b	int;
-	replyc	chan int;
+	a, b    int;
+	replyc  chan int;
 }
 
 type BinOp (a, b int) int;
diff --git a/doc/progs/sort.go b/doc/progs/sort.go
index db0d8b1..3d4fd98 100644
--- a/doc/progs/sort.go
+++ b/doc/progs/sort.go
@@ -5,26 +5,23 @@
 package sort
 
 export type SortInterface interface {
-	len() int;
-	less(i, j int) bool;
-	swap(i, j int);
+	Len() int;
+	Less(i, j int) bool;
+	Swap(i, j int);
 }
 
 export func Sort(data SortInterface) {
-	// Bubble sort for brevity
-	for i := 0; i < data.len(); i++ {
-		for j := i; j < data.len(); j++ {
-			if data.less(j, i) {
-				data.swap(i, j)
-			}
+	for i := 1; i < data.Len(); i++ {
+		for j := i; j > 0 && data.Less(j, j-1); j-- {
+			data.Swap(j, j-1);
 		}
 	}
 }
 
 export func IsSorted(data SortInterface) bool {
-	n := data.len();
+	n := data.Len();
 	for i := n - 1; i > 0; i-- {
-		if data.less(i, i - 1) {
+		if data.Less(i, i - 1) {
 			return false;
 		}
 	}
@@ -33,40 +30,34 @@
 
 // Convenience types for common cases
 
-export type IntArray struct {
-	data *[]int;
-}
+export type IntArray []int
 
-func (p *IntArray) len() int            { return len(p.data); }
-func (p *IntArray) less(i, j int) bool  { return p.data[i] < p.data[j]; }
-func (p *IntArray) swap(i, j int)       { p.data[i], p.data[j] = p.data[j], p.data[i]; }
+func (p IntArray) Len() int            { return len(p); }
+func (p IntArray) Less(i, j int) bool  { return p[i] < p[j]; }
+func (p IntArray) Swap(i, j int)       { p[i], p[j] = p[j], p[i]; }
 
 
-export type FloatArray struct {
-	data *[]float;
-}
+export type FloatArray []float
 
-func (p *FloatArray) len() int            { return len(p.data); }
-func (p *FloatArray) less(i, j int) bool  { return p.data[i] < p.data[j]; }
-func (p *FloatArray) swap(i, j int)       { p.data[i], p.data[j] = p.data[j], p.data[i]; }
+func (p FloatArray) Len() int            { return len(p); }
+func (p FloatArray) Less(i, j int) bool  { return p[i] < p[j]; }
+func (p FloatArray) Swap(i, j int)       { p[i], p[j] = p[j], p[i]; }
 
 
-export type StringArray struct {
-	data *[]string;
-}
+export type StringArray []string
 
-func (p *StringArray) len() int            { return len(p.data); }
-func (p *StringArray) less(i, j int) bool  { return p.data[i] < p.data[j]; }
-func (p *StringArray) swap(i, j int)       { p.data[i], p.data[j] = p.data[j], p.data[i]; }
+func (p StringArray) Len() int            { return len(p); }
+func (p StringArray) Less(i, j int) bool  { return p[i] < p[j]; }
+func (p StringArray) Swap(i, j int)       { p[i], p[j] = p[j], p[i]; }
 
 
 // Convenience wrappers for common cases
 
-export func SortInts(a *[]int)        { Sort(&IntArray{a}); }
-export func SortFloats(a *[]float)    { Sort(&FloatArray{a}); }
-export func SortStrings(a *[]string)  { Sort(&StringArray{a}); }
+export func SortInts(a []int)        { Sort(IntArray(a)); }
+export func SortFloats(a []float)    { Sort(FloatArray(a)); }
+export func SortStrings(a []string)  { Sort(StringArray(a)); }
 
 
-export func IntsAreSorted(a *[]int) bool       { return IsSorted(&IntArray{a}); }
-export func FloatsAreSorted(a *[]float) bool   { return IsSorted(&FloatArray{a}); }
-export func StringsAreSorted(a *[]string) bool { return IsSorted(&StringArray{a}); }
+export func IntsAreSorted(a []int) bool       { return IsSorted(IntArray(a)); }
+export func FloatsAreSorted(a []float) bool   { return IsSorted(FloatArray(a)); }
+export func StringsAreSorted(a []string) bool { return IsSorted(StringArray(a)); }
diff --git a/doc/progs/sortmain.go b/doc/progs/sortmain.go
index 3f2e4f0..3f0c891 100644
--- a/doc/progs/sortmain.go
+++ b/doc/progs/sortmain.go
@@ -4,22 +4,22 @@
 
 package main
 
-import Sort "sort"
+import "sort"
 
 func ints() {
 	data := []int{74, 59, 238, -784, 9845, 959, 905, 0, 0, 42, 7586, -5467984, 7586};
-	a := Sort.IntArray{&data};
-	Sort.Sort(&a);
-	if !Sort.IsSorted(&a) {
+	a := sort.IntArray(data);
+	sort.Sort(a);
+	if !sort.IsSorted(a) {
 		panic()
 	}
 }
 
 func strings() {
 	data := []string{"monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"};
-	a := Sort.StringArray{&data};
-	Sort.Sort(&a);
-	if !Sort.IsSorted(&a) {
+	a := sort.StringArray(data);
+	sort.Sort(a);
+	if !sort.IsSorted(a) {
 		panic()
 	}
 }
@@ -31,12 +31,12 @@
 }
 
 type DayArray struct {
-	data *[]*Day;
+	data []*Day;
 }
 
-func (p *DayArray) len() int            { return len(p.data); }
-func (p *DayArray) less(i, j int) bool  { return p.data[i].num < p.data[j].num; }
-func (p *DayArray) swap(i, j int)       { p.data[i], p.data[j] = p.data[j], p.data[i]; }
+func (p *DayArray) Len() int            { return len(p.data); }
+func (p *DayArray) Less(i, j int) bool  { return p.data[i].num < p.data[j].num; }
+func (p *DayArray) Swap(i, j int)       { p.data[i], p.data[j] = p.data[j], p.data[i]; }
 
 func days() {
 	Sunday :=    Day{ 0, "SUN", "Sunday" };
@@ -47,13 +47,13 @@
 	Friday :=    Day{ 5, "FRI", "Friday" };
 	Saturday :=  Day{ 6, "SAT", "Saturday" };
 	data := []*Day{&Tuesday, &Thursday, &Sunday, &Monday, &Friday};
-	a := DayArray{&data};
-	Sort.Sort(&a);
-	if !Sort.IsSorted(&a) {
+	a := DayArray{data};
+	sort.Sort(&a);
+	if !sort.IsSorted(&a) {
 		panic()
 	}
-	for i := 0; i < len(data); i++ {
-		print(data[i].long_name, " ")
+	for i, d := range data {
+		print(d.long_name, " ")
 	}
 	print("\n")
 }
diff --git a/doc/progs/sum.go b/doc/progs/sum.go
index c8e7b10..3ca1a58 100644
--- a/doc/progs/sum.go
+++ b/doc/progs/sum.go
@@ -4,7 +4,7 @@
 
 package main
 
-func sum(a *[]int) int {   // returns an int
+func sum(a []int) int {   // returns an int
 	s := 0;
 	for i := 0; i < len(a); i++ {
 		s += a[i]
@@ -14,6 +14,6 @@
 
 
 func main() {
-	s := sum(&[]int{1,2,3});  // pass address of int array
+	s := sum([3]int{1,2,3});  // a slice of the array is passed to sum
 	print(s, "\n");
 }