more location cleanup and options for editing and creation