Bug update chbeacon

@Kevinwlee 

Small fixes you suggested, see commit messages.