Added some more godoc comments