Fixed more emrge issues
GIT STUFF