some cleanup and gets for locations