Port todos bundle from v1, some cleanup