Finished transition to Express 4 + minor fixes