add more docs, remove expand-based operations