improved hit detection
Performance tweaks