Added GUI and a few other small thigns