logic fixes
GUI fixes
reflect new snapshot