Changed int types to unsigned int to turn off warnings
Merge branch 'master' into jw_working_on_main
Yep, this is necessary rge branch 'master' into jw_working_on_main