Committed hanging changes (Left uncommitted for a while without notes.)
Experimenting with accepting location as an array, with first item able to be a element or list of elements, besides keywords
Cleanup of changes to location option