added --pop-drop-dist and indentation fixes