tweaks, split shell helper files up