More work on location logging