Fixed output filenaming convention and updated doc strings.