Small fixes and added rates
Merge pull request #6 from WidedKaper/Fixes

Small fixes and added rates