General improvements

- added command line arguments
- added flags and arguments
- made cleaner