Show current API selection;  some tidy up