Clean, update

- Redef
- Added several documentations