Had some additional contributes

Want to merge some changes from an additional contributor?