Multiple small fixes and more GE stuff
more GE stuff