cleanup + additions from .shrc