Lots of changes, GUI more features