layering fix for mouse > goals
picking up fixes