More Gui and logic updates