first commit
settings updated
doc added
comments added
some refactoring