undo singular extensions

and eval fixes