Revert "correcoes diversas"

This reverts commit 7207b4a577ac79e6639004bf291129dc074a8d9e.
correcao parte 2