worked on issue #5 and another small fold fix