Refine semantics
Typo
Docs and cleanup