stashing overview and other changes