Various cleanups; events firing off nicely