optimizations, docs, etc.