Small Changes + alert for not getting rates