Fixed a small bug
Merge branch 'master' into widest_path
Fixed a couple of bugs related to the merge
Ripped out some of the expensive element expression code.