updates for 2.0 and for managing ejs properly