Added important issues
Removed global variables
Updates