Fixed Bugs and stuff#2

AMoore202 wants to merge 2 commits intomasterColinStranc/EGT:masterfrom

Fixed-Bugs-and-stuffColinStranc/EGT:Fixed-Bugs-and-stuffCopy head branch name to clipboard