Minor bug fix and improve output.
This may be enough to support arrays.