fixed generated method order + updated comments and documentation