Fixed problem with GUI hanging up; misc other; cleanup