Fixed exit functionality
Merge gerar
More cleanup