improvements - PassageMaker

improvements