Incorporate feedback

- from @superdweebie