remove unneed stuff and add better logic for hitting things