Attempts to correct section closing and opening bug with location updates, cleanup