Fixed few security issues and adhered to standards