Some cleanings
Error fix
This is better
Commented
More comments
Merge pull request #1 from Aragas/master

Aragas fixes