refactored lots of code, working on #25
Correct minor translation error in spanish