Shrink long lines in opt parser
Add even more comments and few additional checks