Beta: 100%

- added Huw's beta review changes