Added GME + more bugfix