Finish documentation
Harmonize functionality and documentation