Added -sh mode version, cleanup formatting.