Fixed question with no answers and cleaning up

If you have time you can merge this pull request... but you have to solve some conflicts, to maybe is better leave it for later..