ArrayMap and minor edits and fixes.