fix several errors and modularize engarces
Merge branch 'master' of github.com:BorjaMartin/herosinatra