Inline docs, minor changes