Added options and more documentation
Improvements