address remaining PR things