Converted remaining global variables to ''our''
Converted some ''our'' variables to ''my''
continued...