a few tweaks pre shiny2