Zza: no more lock into "current working directory" + small touch improvements