fixed some of Bryertons issues