script based parser improvements still not 100% right but is better