updating parser and certain handeling