More Little changes, working in GUI now.