update BR, cleanups