fixed a few eval issues