小的修改
Assorted class utilities and tools