small fixes and typos
Merge pull request #49 from guillp/fixes

small fixes and typos