Some AUTH, some cleanup, more comments for godoc