small code clean up
remove some warnings
browsing: stop at last candidate