Updated ntentan
More security fixes