Few shell tweaks