Lots improved, I reckon.
Tá ficando bom! \o;/
Github conflicts fixed.