bugs fixed at import Peg from other files