Inline docs & updated signature & generation code