Small fixes and added rates