Add zprofile
Update saveorg to handle upstream changes