random cleanups/enhancements