Small arrow improvements and tweaks