Bug fix and minor improvements to gameplay#4

ignitr0n wants to merge 2 commits into

SplatooD:masterSplatooD/splatood:masterfrom

ignitr0n:masterignitr0n/splatood:masterCopy head branch name to clipboard