update to express 4, other changes