making all options to use single '-'
cleaning up
fixing line lengths