Minor changes, cleaning up arrays.