Fixed most bugs in in-line eval