More xBR options and code cleanup (unix)