Implemented fixes from other peoples pull requests into one