Most of 1.3.4 complete

Everything except last problem