Improve GUI, update doc, clean up