changes and fixes raedy