Move hit to hand class, misc other bug fixes