add correct ipaddress to show
Tidied code ready for merge
Merge branch 'jix-refactor'