WIP
- packages creation
- corrections