Lots of code cleanup to help remove memory leaks and other bugs.

Fix bug that broke slots when exiting while an error modal was present.