Bunch of fixes and updated express.