Aesh improvements