Small fixes and cleanup

Added show all countries option