bugs fixed
parser nodified