Huge updates on gulp