remove some duplicated spaces among of code
improve documentation, add all options