added more parser stuff