Slight Fixes
Merge branch 'WillsBranch'