Some shell improvements.