various enhancements from other projects