More inline documentation, down to line ~300