Fixes for instances of the game crashing, and more improvements on the outline bug