shouldnt reset points if i get hit by barrel. only bonus

and some cleaning up