GEM:32 made some more small changes