Update

- Added some security.
- Cleaned / Changed some code.