Containers, Gui's, bug fixes with NPE, bit or restructuring