Various changes and simplifications + Auth for Express 4.0