added internals for GUI
minor changes