Fixes some minor bugs for Mercy
Fixes some minor bugs for Mercy

Lanedon/spni.github.io,chase-s/spni.github.io,Lanedon/spni.github.io,spni/spni.github.io,chase-s/spni.github.io,Lanedon/spni.github.io,chase-s/spni.github.io,spni/spni.github.io