Code & doc enhancements