Add array indexing
Clean up some output formatting.