Added strconv; performed some minor tuning.