Minor adjustments.
Adding base for gui/xml work.