Updated Express to Express 4 and fixed some inconsistencies)