more fixes, added simple eval