Code Tidy
LocationUpdate generation
Added actor selection