Massive Update 3.5 with Fixes

Fixes #656.