Improve documentation

Improved documentation (2 commits, second one Is actually a rollback of things done wrong :( sorry)