divided out player controls, rearranged some collision, fleshed out attacks a little