Fix memory leak... hopefully
Hide progress on mode change
Some minor changes