Fix
Selection tool tweaks