Some small changes made during demo.
Bugs related to class and thread cleanup solved.
Small changes.