Adding more improvements

- arguments parsing
- data management
- other program improvements