Fixes in rates
Merge branch 'reborn' of https://github.com/vavan/eia into reborn