Fixing Some Bugs

by Felippe Silveira