output changes and some GUI changes