some corrections
more improvements
bunch of corrections
remove the replace
Merge pull request #150 from cordoval/more-work

some corrections