A bunch of shell tweaks