small optimizations
small enhancements