Update to express 4.0 and other updates and fixes