more godoc comments