fixed last bug, commented