Some changes I'm not even aware of XD i think i tried to fix the gwt
part