A few changes and updated express to 4.0